Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Base effects other than productivity #378

Merged
merged 3 commits into from
Jan 7, 2025
Merged

Base effects other than productivity #378

merged 3 commits into from
Jan 7, 2025

Conversation

SWeini
Copy link
Collaborator

@SWeini SWeini commented Dec 27, 2024

Applies the three relevant base effects to recipes and show some more information in tooltips.

Fixes #372

@SWeini SWeini requested a review from shpaass as a code owner December 27, 2024 08:12
shpaass
shpaass approved these changes Dec 27, 2024
View reviewed changes
Copy link
Owner

@shpaass shpaass left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for the feature!

veger
veger approved these changes Dec 27, 2024
View reviewed changes
Copy link
Collaborator

@veger veger left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice!

A changelog entry is missing, as this is good improvement/fix, we should add one

@shpaass
Copy link
Owner

shpaass commented Jan 6, 2025 •
edited
Loading

Rebased on fresh master. Will add release notes and merge after #382 is merged.
PSA for release notes - the basic effects are: productivity, speed, and consumption.

@shpaass
Copy link
Owner

shpaass commented Jan 7, 2025

Rebased on fresh master and added a changelog entry.

@shpaass
Copy link
Owner

shpaass commented Jan 7, 2025

The following diff shows that I only added the changelog

$ git range-diff 921e6ff~3..921e6ff ae1bec3~3..ae1bec3
1:  981f1fe = 1:  9e0bde7 feat: apply base effects to calculations
2:  7e4af85 = 2:  f7486fa feat: show base effects in module customization UI
3:  921e6ff ! 3:  ae1bec3 feat: add base effect to entity tooltip
    @@ Yafc/Widgets/ObjectTooltip.cs: doneDrawing:;
                          }

                          if (crafter.allowedEffects != AllowedEffects.None) {
    +
    + ## changelog.txt ##
    +@@
    + ----------------------------------------------------------------------------------------------------------------------
    + Version:
    + Date:
    ++    Features:
    ++        - Apply productivity, speed, and consumption effects to recipes, and show them in tooltips.
    +     Fixes:
    +         - Building emission/absorption (pollution and spores) are displayed in tooltips again.
    + ----------------------------------------------------------------------------------------------------------------------

@shpaass shpaass merged commit 94f24c6 into master Jan 7, 2025
1 check passed
@shpaass shpaass deleted the base-effect branch January 7, 2025 21:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@shpaass shpaass shpaass approved these changes

@veger veger veger approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Account for default effect receivers
3 participants
@SWeini @shpaass @veger